# This is a BitKeeper generated diff -Nru style patch. # # include/asm-x86_64/i387.h # 2004/06/14 14:05:40-03:00 ak@suse.de +1 -1 # Fix FPU delayed exceptions on x86-64 too # # ChangeSet # 2004/06/15 11:19:12-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # # include/linux/pci_ids.h # 2004/06/15 11:19:11-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # drivers/pci/pci.ids # 2004/06/15 11:19:11-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # drivers/net/tg3.c # 2004/06/15 11:19:11-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # Documentation/Configure.help # 2004/06/15 11:19:10-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/06/15 10:00:23-03:00 zaitcev@redhat.com # [PATCH] USB: unusual_dev.h add Sony Handycam HC-85 # # A regular update from Alan Stern - Sony Handycam HC-85. # -- Pete # # drivers/usb/storage/unusual_devs.h # 2004/06/12 18:48:42-03:00 zaitcev@redhat.com +7 -0 # USB: unusual_dev.h add Sony Handycam HC-85 # # ChangeSet # 2004/06/15 09:56:33-03:00 zaitcev@redhat.com # [PATCH] USB: Update mct_u232 # # This is a fairly straightforward backport from 2.6.6. # My MCT U9 is hardly useable without it, because the 2.4 driver # keeps forgetting to set the baud rate. Only applications which # pre-set baud rate work (to anything other than 9600, too). # And god forbid you run getty with this thing. # # This is independent from the write-from-interrupt part I posted # before, but both are needed for getty to work. # # drivers/usb/serial/mct_u232.c # 2004/06/12 18:24:26-03:00 zaitcev@redhat.com +165 -131 # USB: Update mct_u232 # # ChangeSet # 2004/06/15 09:52:11-03:00 zaitcev@redhat.com # [PATCH] Fix USB serial race # # Work around a situation where a line discipline attempts to write # from an interrupt context and oopses when trying to take a semaphore. # This includes primarily PPP and getty, but I had people with GPS # and custom software stepping on it as well. # # -- Pete # # drivers/usb/serial/usbserial.c # 2004/06/12 18:24:26-03:00 zaitcev@redhat.com +278 -30 # Fix USB serial race # # drivers/usb/serial/usb-serial.h # 2004/06/12 18:48:13-03:00 zaitcev@redhat.com +3 -0 # Fix USB serial race # # ChangeSet # 2004/06/15 09:26:40-03:00 raven@themaw.net # [PATCH] minor autofs4 fs/namei.c fix, URL update # # Recent work on autofs4 in 2.6 has resulted in the need for a small # change, outside of the autofs4 module, in fs/namei.c. The change # allows the removal of some long time troublesome code in the # module and allows the handling of the sys_chdir and sys_chroot # to work correctly with recent autofs module and userspace package # updates. # # I'm including two patches for your consideration. The one # mentioned above and another which updates the location of the # autofs version 4 software. # # The first patch applies cleanly to 2.4.27-pre5 while the # second applies correctly with a sizable offset. # # Ian # # fs/namei.c # 2004/04/24 03:43:56-03:00 raven@themaw.net +2 -2 # minor autofs4 fs/namei.c fix, URL update # # Documentation/Configure.help # 2004/04/24 04:11:14-03:00 raven@themaw.net +1 -1 # minor autofs4 fs/namei.c fix, URL update # # ChangeSet # 2004/06/15 09:15:41-03:00 nickpiggin@yahoo.com.au # [PATCH] rwsem race fixes backported from 2.6 # # This patch should be the equivalent of the race fixes that # went into 2.6. # # As you know, they have survived the 2.6.6 release. They # should be minimal risk. # # Patch does two things: # # First, get a reference count on the the sleeper, so that it can't # possibly go away before we've sent it the wakeup event (eg. exit) # # The second thing it does is be more careful about semaphore # contention memory ordering. Don't touch the wakee stack after # marking it runnable - the stack might become invalid any time # after it has been made runnable. # # Code was a result of discussion and input from Linus, David and # myself. # # lib/rwsem.c # 2004/05/07 03:12:15-03:00 nickpiggin@yahoo.com.au +14 -7 # rwsem fixes backported from 2.6 # # lib/rwsem-spinlock.c # 2004/05/07 03:16:10-03:00 nickpiggin@yahoo.com.au +20 -8 # rwsem fixes backported from 2.6 # # ChangeSet # 2004/06/14 17:32:25-07:00 laforge@netfilter.org # [NETFILTER]: Don't assign new helper after NAT when there are already expectations present. # # Signed-off-by: Patrick McHardy # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ip_conntrack_core.c # 2004/06/14 17:32:20-07:00 laforge@netfilter.org +5 -6 # [NETFILTER]: Don't assign new helper after NAT when there are already expectations present. # # Signed-off-by: Patrick McHardy # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/14 21:21:45-03:00 ak@suse.de # [PATCH] Fix FPU delayed exceptions on x86-64 too # # This fixes the recent FPU delayed exception kernel hang on x86-64 too. # # ChangeSet # 2004/06/14 16:05:28-03:00 marcelo@logos.cnet # Alexander Nyberg/Andi/Sergey: Fix x86 "clear_cpu()" macro. # # Linus's 2.6 changelog: # # Fix x86 "clear_cpu()" macro. # # We need to clear all exceptions before synchronizing # with the FPU, since we aren't ready to handle a FP # exception here and we're getting rid of all FP state. # # Special thanks to Alexander Nyberg for reports and # testing. Alternate patches by Sergey Vlasov and Andi # Kleen, who both worked on this. # # Signed-off-by: Linus Torvalds # # include/asm-i386/i387.h # 2004/06/14 16:04:08-03:00 marcelo@logos.cnet +1 -1 # Alexander Nyberg/Andi/Sergey: Fix x86 "clear_cpu()" macro. # # ChangeSet # 2004/06/13 17:01:14-04:00 bcollins@debian.org # pcilynx: Disable LCtrl bit with IRM contender # # Signed-off-by: Ben Collins # # drivers/ieee1394/pcilynx.c # 2004/06/13 16:50:47-04:00 bcollins@debian.org +3 -3 # Disable LCtrl bit with IRM contender # # ChangeSet # 2004/06/13 16:49:14-04:00 bcollins@debian.org # sbp2: Default sbp2_serialize_io to 1. # # Signed-off-by: Ben Collins # # drivers/ieee1394/sbp2.c # 2004/06/13 16:48:10-04:00 bcollins@debian.org +2 -2 # Default sbp2_serialize_io to 1. # # ChangeSet # 2004/06/13 16:47:13-04:00 bcollins@debian.org # video1394: Bugfix for low res format7 images # # Submitted-by: Damien Douxchamps # Signed-off-by: Ben Collins # # drivers/ieee1394/video1394.c # 2004/06/13 16:45:18-04:00 bcollins@debian.org +35 -22 # Bugfix for low res format7 images # # ChangeSet # 2004/06/12 18:54:57-03:00 herbert@gondor.apana.org.au # [PATCH] Fix /proc/ide/hpt366 crash # # The following patch which fixes fixes the disk spindown problem when # /proc/ide/hpt366 is read has been in 2.6 for a couple of months. It # has just been verified that the same fix is needed and works under # 2.4 (see http://bugs.debian.org/250171). # # ===== drivers/ide/pci/hpt366.c 1.14 vs edited ===== # # drivers/ide/pci/hpt366.c # 2004/06/09 08:20:01-03:00 herbert@gondor.apana.org.au +2 -2 # Fix /proc/ide/hpt366 crash # # ChangeSet # 2004/06/12 17:17:01-03:00 ink@jurassic.park.msu.ru # [PATCH] Alpha: fix PCI bridge swizzle on takara and eiger # # Fix NULL pointer dereference (bus->self) for PCI devices on the root bus. # # Signed-off-by: Ivan Kokshaysky # # arch/alpha/kernel/sys_takara.c # 2004/06/11 21:40:37-03:00 ink@jurassic.park.msu.ru +5 -1 # Alpha: fix PCI bridge swizzle on takara and eiger # # arch/alpha/kernel/sys_eiger.c # 2004/06/11 21:40:37-03:00 ink@jurassic.park.msu.ru +12 -19 # Alpha: fix PCI bridge swizzle on takara and eiger # # ChangeSet # 2004/06/12 17:16:36-03:00 ink@jurassic.park.msu.ru # [PATCH] Alpha: don't put IDE disks in standby mode on halt # # Backported from 2.6. # # Signed-off-by: Ivan Kokshaysky # # drivers/ide/ide.c # 2004/06/11 21:32:19-03:00 ink@jurassic.park.msu.ru +17 -0 # Alpha: don't put IDE disks in standby mode on halt # # ChangeSet # 2004/06/12 12:15:09-07:00 davem@kernel.bkbits.net # Merge davem@nuts.davemloft.net:/disk1/BK/tg3-2.4 # into kernel.bkbits.net:/home/davem/tg3-2.4 # # include/linux/pci_ids.h # 2004/06/12 12:15:08-07:00 davem@kernel.bkbits.net +0 -0 # Auto merged # # ChangeSet # 2004/06/12 11:44:06-07:00 davem@nuts.davemloft.net # [TG3]: Update driver version and reldate. # # drivers/net/tg3.c # 2004/06/12 11:44:00-07:00 davem@nuts.davemloft.net +2 -2 # [TG3]: Update driver version and reldate. # # ChangeSet # 2004/06/12 11:20:37-07:00 davem@nuts.davemloft.net # [TG3]: Chip support update and a power-save bug fix. # # 1) Add PCI IDs and driver entries for 5789, 5751M and # 5751F chips. Mark 5751F chips as 10/100 only. # 2) Call pci_restore_state() at beginning of tg3_resume() as # this helps some chips come out of D3 more cleanly. # # include/linux/pci_ids.h # 2004/06/12 11:20:15-07:00 davem@nuts.davemloft.net +3 -0 # [TG3]: Chip support update and a power-save bug fix. # # 1) Add PCI IDs and driver entries for 5789, 5751M and # 5751F chips. Mark 5751F chips as 10/100 only. # 2) Call pci_restore_state() at beginning of tg3_resume() as # this helps some chips come out of D3 more cleanly. # # drivers/pci/pci.ids # 2004/06/12 11:20:15-07:00 davem@nuts.davemloft.net +3 -0 # [TG3]: Chip support update and a power-save bug fix. # # 1) Add PCI IDs and driver entries for 5789, 5751M and # 5751F chips. Mark 5751F chips as 10/100 only. # 2) Call pci_restore_state() at beginning of tg3_resume() as # this helps some chips come out of D3 more cleanly. # # drivers/net/tg3.c # 2004/06/12 11:20:14-07:00 davem@nuts.davemloft.net +11 -1 # [TG3]: Chip support update and a power-save bug fix. # # 1) Add PCI IDs and driver entries for 5789, 5751M and # 5751F chips. Mark 5751F chips as 10/100 only. # 2) Call pci_restore_state() at beginning of tg3_resume() as # this helps some chips come out of D3 more cleanly. # # ChangeSet # 2004/06/10 22:41:52-07:00 adilger@clusterfs.com # [IPV4]: Fix bug in arp_tables.c fix. # # net/ipv4/netfilter/arp_tables.c # 2004/06/10 22:41:46-07:00 adilger@clusterfs.com +1 -1 # [IPV4]: Fix bug in arp_tables.c fix. # # ChangeSet # 2004/06/10 22:04:28-07:00 davem@nuts.davemloft.net # [IPV4]: Fix unaligned accesses in arp_tables.c # # net/ipv4/netfilter/arp_tables.c # 2004/06/10 22:04:20-07:00 davem@nuts.davemloft.net +3 -4 # [IPV4]: Fix unaligned accesses in arp_tables.c # # ChangeSet # 2004/06/10 22:01:27-07:00 juhl-lkml@dif.dk # [NET]: Remove junk from packet_mmap.txt # # Documentation/networking/packet_mmap.txt # 2004/06/10 22:01:16-07:00 juhl-lkml@dif.dk +0 -13 # [NET]: Remove junk from packet_mmap.txt # # ChangeSet # 2004/06/10 22:00:13-07:00 chaapala@cisco.com # [CRYPTO]: Fix digest.c kmapping sg entries > page in length. # # Below is the patch, against 2.6.7-rc2, to fix crypto/digest.c to do # multiple kmap()/kunmap() for scatterlist entries which have a size # greater than a single page, originally found and fixed by # N.C.Krishna Murthy . # # Signed-off-by: Clay Haapala # Signed-off-by: David S. Miller # # crypto/digest.c # 2004/06/10 22:00:06-07:00 chaapala@cisco.com +21 -6 # [CRYPTO]: Fix digest.c kmapping sg entries > page in length. # # Below is the patch, against 2.6.7-rc2, to fix crypto/digest.c to do # multiple kmap()/kunmap() for scatterlist entries which have a size # greater than a single page, originally found and fixed by # N.C.Krishna Murthy . # # Signed-off-by: Clay Haapala # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/09 16:35:49-05:00 shaggy@austin.ibm.com # JFS: Better RAS when btstack is overrun # # The current warning and/or trap when the btstack is overrun in # dtSearch or dtReadFirst are not very helpful. Add code to detect # the stack overrun earlier, print something useful, and return # gracefully. # # I've found that dbFree being called with blkno == 0 can lead to this # error, so I put in a specific check for that. # # Signed-off-by: Dave Kleikamp # # fs/jfs/jfs_types.h # 2004/06/09 16:35:47-05:00 shaggy@austin.ibm.com +2 -1 # Handle dtree stack overflow better # # fs/jfs/jfs_dtree.c # 2004/06/09 16:35:47-05:00 shaggy@austin.ibm.com +9 -2 # Handle dtree stack overflow better # # fs/jfs/jfs_dmap.c # 2004/06/09 16:35:47-05:00 shaggy@austin.ibm.com +2 -2 # Have dbFree check for freeing block zero. It shouldn't happen and # can cause further problems. # # fs/jfs/jfs_btree.h # 2004/06/09 16:35:47-05:00 shaggy@austin.ibm.com +18 -6 # Handle dtree stack overflow better # # ChangeSet # 2004/06/03 14:05:35-05:00 shaggy@austin.ibm.com # JFS: Handle out of space errors more gracefully # # Signed-off-by: Dave Kleikamp # # fs/jfs/namei.c # 2004/06/03 14:05:27-05:00 shaggy@austin.ibm.com +44 -65 # Handle out of space errors more gracefully # # fs/jfs/jfs_txnmgr.c # 2004/06/03 14:05:26-05:00 shaggy@austin.ibm.com +21 -23 # Handle out of space errors more gracefully # # fs/jfs/jfs_dtree.c # 2004/06/03 14:05:25-05:00 shaggy@austin.ibm.com +6 -2 # Handle out of space errors more gracefully # # ChangeSet # 2004/05/26 11:46:50-07:00 davem@nuts.davemloft.net # [TG3]: Use HOST TXDs always. # # drivers/net/tg3.c # 2004/05/26 11:46:42-07:00 davem@nuts.davemloft.net +9 -0 # [TG3]: Use HOST TXDs always. # diff -Nru a/Documentation/Configure.help b/Documentation/Configure.help --- a/Documentation/Configure.help 2004-06-16 10:57:57 -07:00 +++ b/Documentation/Configure.help 2004-06-16 10:57:57 -07:00 @@ -18690,6 +18690,11 @@ purpose port, say Y here. See . +Support for serial ports defined in ACPI namespace +CONFIG_SERIAL_ACPI + If you wish to enable serial port discovery via the ACPI + namespace, say Y here. If unsure, say N. + Support for PowerMac serial ports CONFIG_MAC_SERIAL If you have Macintosh style serial ports (8 pin mini-DIN), say Y